Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:01:01 +0000 (11:01 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:01:01 +0000 (11:01 -0800)
commit1dd956c466d1828e494b01013d61564ac0e53c29
tree91609e9e36b3ed38b1147bf842eb57dfbe3dc8a2
parent3ee791f8360773d3df697e738701600a230f5998
parentd187559dd7c481e735c14dec9c822fc9b8e642a6
Merge from mainline.
45 files changed:
ChangeLog
Makefile.in
admin/ChangeLog
configure
configure.in
lib-src/emacsclient.c
lib-src/fakemail.c
lib-src/gettext.h
lib-src/make-docfile.c
lib-src/movemail.c
lib-src/pop.c
lib-src/test-distrib.c
lib-src/update-game-score.c
lisp/dired.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/htmlfontify.el
lisp/mail/rmail.el
lisp/ps-print.el
src/ChangeLog
src/alloc.c
src/atimer.c
src/buffer.c
src/data.c
src/deps.mk
src/dired.c
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/fileio.c
src/filelock.c
src/fns.c
src/getloadavg.c
src/getpagesize.h
src/gmalloc.c
src/image.c
src/print.c
src/process.h
src/ralloc.c
src/termcap.c
src/xfns.c
src/xrdb.c
src/xselect.c
src/xsmfns.c
src/xterm.c